From c542b41febc017715cb47368a644d3eef30061e7 Mon Sep 17 00:00:00 2001 From: "emellor@leeni.uk.xensource.com" Date: Fri, 9 Dec 2005 10:50:26 +0000 Subject: [PATCH] Added do_without_error function, and squelch the error from mkdir when trying to create the lock directory. Signed-off-by: Ewan Mellor --- tools/examples/xen-hotplug-common.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/examples/xen-hotplug-common.sh b/tools/examples/xen-hotplug-common.sh index 4c2c836953..ce9a9f6e1a 100644 --- a/tools/examples/xen-hotplug-common.sh +++ b/tools/examples/xen-hotplug-common.sh @@ -46,6 +46,10 @@ do_or_die() { "$@" || fatal "$@ failed" } +do_without_error() { + "$@" 2>/dev/null || log debug "$@ failed" +} + sigerr() { fatal "$0 failed; error detected." } @@ -121,7 +125,7 @@ _claim_lock() while [ $retries -lt $LOCK_RETRIES ] do - mkdir "$lockdir" && trap "release_lock $1; sigerr" ERR && + mkdir "$lockdir" 2>/dev/null && trap "release_lock $1; sigerr" ERR && _update_lock_info "$lockdir" && return local new_owner=$(_lock_owner "$lockdir") -- 2.30.2